From b024a2be3508e435b53f272366512ca43d59dc6a Mon Sep 17 00:00:00 2001 From: Bryan Tong Minh Date: Mon, 11 Jan 2010 11:47:50 +0000 Subject: [PATCH] Followup r58980: Moved logic for addsection-editintro/preload from SkinTemplate to EditPage. Message names changed from talk-addsection-* to addsection-*. Messages now contain the preload/editnotice themselves instead of the title of the page that contains them. --- RELEASE-NOTES | 4 ++-- includes/EditPage.php | 9 +++++++-- includes/SkinTemplate.php | 11 +---------- languages/messages/MessagesEn.php | 4 ++-- maintenance/language/messages.inc | 4 ++-- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index c06667d58f..227971f7fb 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -273,8 +273,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * rebuildtextindex.php maintenance script now supports databases other than MySQL * upgrade1_5.php now requires to be run --update option to prevent confusion -* (bug 17662) Customizable default preload/editintro in add-new-section link - for Talk page +* (bug 17662) Customizable default preload/editintro for new sections in the + respective addsection-preload and addsection-editintro messages * Added maintenance script syntaxChecker.php that checks for PHP syntax errors and common coding mistakes * Updated Unicode normalization tables diff --git a/includes/EditPage.php b/includes/EditPage.php index 99cc487293..caf3f88900 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -129,7 +129,10 @@ class EditPage { wfProfileIn( __METHOD__ ); # Get variables from query string :P $section = $wgRequest->getVal( 'section' ); - $preload = $wgRequest->getVal( 'preload' ); + + $preload = $wgRequest->getVal( 'preload', + // Custom preload text for new sections + $section === 'new' ? 'MediaWiki:addsection-preload' : '' ); $undoafter = $wgRequest->getVal( 'undoafter' ); $undo = $wgRequest->getVal( 'undo' ); @@ -709,7 +712,9 @@ class EditPage { $this->oldid = $request->getInt( 'oldid' ); $this->live = $request->getCheck( 'live' ); - $this->editintro = $request->getText( 'editintro' ); + $this->editintro = $request->getText( 'editintro', + // Custom edit intro for new sections + $this->section === 'new' ? 'MediaWiki:addsection-editintro' : '' ); wfProfileOut( __METHOD__ ); diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 9127d3ee31..cbe689ff00 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -760,19 +760,10 @@ class SkinTemplate extends Skin { // adds new section link if page is a current revision of a talk page or if ( ( $wgArticle && $wgArticle->isCurrent() && $istalk ) || $wgOut->showNewSectionLink() ) { if ( !$wgOut->forceHideNewSectionLink() ) { - $urlArgs = 'action=edit§ion=new'; - $preloadMsg = wfMsgForContent( 'talk-addsection-preload' ); - $editintroMsg = wfMsgForContent( 'talk-addsection-editintro' ); - if( $preloadMsg != '' ) { - $urlArgs .= '&preload=' . urlencode( $preloadMsg ); - } - if( $editintroMsg != '' ) { - $urlArgs .= '&editintro=' . urlencode( $editintroMsg ); - } $content_actions['addsection'] = array( 'class' => $section == 'new' ? 'selected' : false, 'text' => wfMsg( 'addsection' ), - 'href' => $this->mTitle->getLocalUrl( $urlArgs ) + 'href' => $this->mTitle->getLocalUrl( 'action=edit§ion=new' ) ); } } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 8e78c70d73..9530897044 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1359,8 +1359,8 @@ It appears to have been deleted.', 'edit-no-change' => 'Your edit was ignored, because no change was made to the text.', 'edit-already-exists' => 'Could not create a new page. It already exists.', -'talk-addsection-preload' => '', # do not translate or duplicate this message to other languages -'talk-addsection-editintro' => '', # do not translate or duplicate this message to other languages +'addsection-preload' => '', # do not translate or duplicate this message to other languages +'addsection-editintro' => '', # do not translate or duplicate this message to other languages # Parser/template warnings 'expensive-parserfunction-warning' => "'''Warning:''' This page contains too many expensive parser function calls. diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 4f0a52b083..ef1d5b0894 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -602,8 +602,8 @@ $wgMessageStructure = array( 'edit-conflict', 'edit-no-change', 'edit-already-exists', - 'talk-addsection-preload', - 'talk-addsection-editintro', + 'addsection-preload', + 'addsection-editintro', ), 'parserwarnings' => array( 'expensive-parserfunction-warning', -- 2.20.1